Skip to content

Conversation

onur-ozkan
Copy link
Contributor

This way, we only update CONFIG_CHANGE_HISTORY for major changes, which is much simpler (and updating example.toml doesn't make much sense)

r? @Kobzol (as this was mainly your idea)

This way, we only update CONFIG_CHANGE_HISTORY for major changes, which is
much simpler (and updating example.toml doesn't make much sense)

Signed-off-by: onur-ozkan <[email protected]>
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Dec 18, 2023
@rustbot
Copy link
Collaborator

rustbot commented Dec 18, 2023

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs and change-id in config.example.toml.

@Kobzol
Copy link
Member

Kobzol commented Dec 18, 2023

Looks good to me. My original idea was to actually put the latest value of change-id into the currently active config.toml if it's missing, but I'm not sure if modifying the config file is a good idea, and it would complicate code unnecessarily.

Since bootstrap anyway tells us if change-id is missing, I think that this is enough.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 18, 2023

📌 Commit ce2eaa6 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 18, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 18, 2023
…iaskrgr

Rollup of 3 pull requests

Successful merges:

 - rust-lang#118941 (llvm-wrapper: adapt for LLVM API changes)
 - rust-lang#119068 (Copy 1.74.1 release notes to master)
 - rust-lang#119080 (Comment out `change-id` in `config.example.toml`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9a24d8a into rust-lang:master Dec 18, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 18, 2023
Rollup merge of rust-lang#119080 - onur-ozkan:comment-change-id-in-example-config, r=Kobzol

Comment out `change-id` in `config.example.toml`

This way, we only update CONFIG_CHANGE_HISTORY for major changes, which is much simpler (and updating example.toml doesn't make much sense)

r? `@Kobzol` (as this was mainly your idea)
@rustbot rustbot added this to the 1.76.0 milestone Dec 18, 2023
@onur-ozkan onur-ozkan deleted the comment-change-id-in-example-config branch February 17, 2024 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants